GtkScrolledWindow: Don't handle key event when can't scroll

Don't return that a key event was handled when the corresponding
scrollbar can not scroll.

https://bugzilla.gnome.org/show_bug.cgi?id=753256

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index a56844f5421f40471db0b6c235f9ce9836c1a111..1c8536266d869c8a0afd255350994e026f44c6d3 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2463,9 +2463,19 @@ gtk_scrolled_window_scroll_child (GtkScrolledWindow *scrolled_window,
     }
 
   if (horizontal)
-    adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
+    {
+      if (may_hscroll (scrolled_window))
+        adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
+      else
+        return FALSE;
+    }
   else
-    adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
+    {
+      if (may_vscroll (scrolled_window))
+        adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
+      else
+        return FALSE;
+    }
 
   if (adjustment)
     {